Adapt to motion controller api change

The signature of the enter/leave signals changed.
Adapt all users.

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index cf97d48ba2932711bc9cca34867f1e6d44026757..06d1240fb4d336090213a0a2dc7ca8f2b9fc9fbf 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -164,6 +164,8 @@ static void             gtk_icon_view_motion                    (GtkEventControl
                                                                  double              y,
                                                                  gpointer            user_data);
 static void             gtk_icon_view_leave                     (GtkEventController *controller,
+                                                                 GdkCrossingMode     mode,
+                                                                 GdkNotifyType       detail,
                                                                  gpointer            user_data);
 static void             gtk_icon_view_button_press              (GtkGestureMultiPress *gesture,
                                                                  int                   n_press,
@@ -1875,6 +1877,8 @@ gtk_icon_view_motion (GtkEventController *controller,
 
 static void
 gtk_icon_view_leave (GtkEventController *controller,
+                     GdkCrossingMode     mode,
+                     GdkNotifyType       detail,
                      gpointer            user_data)
 {
   GtkIconView *icon_view;

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index e3be68e02e1fdba1c22e03131dffa872e1204548..859fa5059a0442a02a7de7bddc989ec3e4ef8116 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -425,6 +425,8 @@ static void gtk_label_motion            (GtkEventControllerMotion *controller,
                                          double                    y,
                                          gpointer                  data);
 static void gtk_label_leave             (GtkEventControllerMotion *controller,
+                                         GdkCrossingMode           mode,
+                                         GdkNotifyType             detail,
                                          gpointer                  data);
 
 static void     gtk_label_grab_focus        (GtkWidget        *widget);
@@ -4870,6 +4872,8 @@ gtk_label_motion (GtkEventControllerMotion *controller,
 
 static void
 gtk_label_leave (GtkEventControllerMotion *controller,
+                 GdkCrossingMode           mode,
+                 GdkNotifyType             detail,
                  gpointer                  data)
 {
   GtkLabel *label = GTK_LABEL (data);

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 247dd4f12eeca0b57faaa18e7a33f2ed65e7b70a..ad0209367fbf85a40585d51cfa838ae48557b903 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -215,8 +215,12 @@ static void     gtk_menu_motion            (GtkEventController *controller,
 static void     gtk_menu_enter             (GtkEventController *controller,
                                             double              x,
                                             double              y,
+                                            GdkCrossingMode     mode,
+                                            GdkNotifyType       detail,
                                             gpointer            user_data);
 static void     gtk_menu_leave             (GtkEventController *controller,
+                                            GdkCrossingMode     mode,
+                                            GdkNotifyType       detail,
                                             gpointer            user_data);
 static gboolean gtk_menu_key_pressed       (GtkEventControllerKey *controller,
                                             guint                  keyval,
@@ -3165,6 +3169,8 @@ static void
 gtk_menu_enter (GtkEventController *controller,
                 double              x,
                 double              y,
+                GdkCrossingMode     mode,
+                GdkNotifyType       detail,
                 gpointer            user_data)
 {
   GdkDevice *source_device;
@@ -3191,6 +3197,8 @@ gtk_menu_enter (GtkEventController *controller,
 
 static void
 gtk_menu_leave (GtkEventController *controller,
+                GdkCrossingMode     mode,
+                GdkNotifyType       detail,
                 gpointer            user_data)
 {
   GtkMenu *menu;

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index f516c38d6de3dc778b30b1bebc476910e32e6e94..e7213ebe587d9d543cd267008f6422611fae6546 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -141,8 +141,12 @@ static void gtk_menu_item_destroy        (GtkWidget        *widget);
 static void gtk_menu_item_enter          (GtkEventController *controller,
                                           double              x,
                                           double              y,
+                                          GdkCrossingMode     mode,
+                                          GdkNotifyType       detail,
                                           gpointer            user_data);
 static void gtk_menu_item_leave          (GtkEventController *controller,
+                                          GdkCrossingMode     mode,
+                                          GdkNotifyType       detail,
                                           gpointer            user_data);
 static void gtk_menu_item_parent_cb      (GObject          *object,
                                           GParamSpec       *pspec,
@@ -1117,22 +1121,20 @@ static void
 gtk_menu_item_enter (GtkEventController *controller,
                      double              x,
                      double              y,
+                     GdkCrossingMode     mode,
+                     GdkNotifyType       detail,
                      gpointer            user_data)
 {
   GtkMenuItem *menu_item = GTK_MENU_ITEM (user_data);
   GtkWidget *menu_shell;
-  GdkCrossingMode mode;
   GdkEvent *event;
 
   event = gtk_get_current_event (); /* FIXME controller event */
 
-  if (gdk_event_get_crossing_mode ((GdkEvent *)event, &mode))
-    {
-      if (mode == GDK_CROSSING_GTK_GRAB ||
-          mode == GDK_CROSSING_GTK_UNGRAB ||
-          mode == GDK_CROSSING_STATE_CHANGED)
-        return;
-    }
+  if (mode == GDK_CROSSING_GTK_GRAB ||
+      mode == GDK_CROSSING_GTK_UNGRAB ||
+      mode == GDK_CROSSING_STATE_CHANGED)
+    return;
 
   if (gdk_event_get_device ((GdkEvent*) event) ==
       gdk_event_get_source_device ((GdkEvent*) event))
@@ -1147,6 +1149,8 @@ gtk_menu_item_enter (GtkEventController *controller,
 
 static void
 gtk_menu_item_leave (GtkEventController *controller,
+                     GdkCrossingMode     mode,
+                     GdkNotifyType       detail,
                      gpointer            user_data)
 {
   GtkMenuItem *menu_item = GTK_MENU_ITEM (user_data);

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 6a45c7893dc79f4210c013fd60e44f09ce7ddc5f..58ff31bd056299fb4ae27134a955c9b605b910e9 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -929,8 +929,12 @@ static void gtk_tree_view_drag_gesture_end                  (GtkGestureDrag *ges
 static void gtk_tree_view_motion_controller_enter           (GtkEventControllerMotion *controller,
                                                              double                    x,
                                                              double                    y,
+                                                             GdkCrossingMode           mode,
+                                                             GdkNotifyType             detail,
                                                              GtkTreeView              *tree_view);
 static void gtk_tree_view_motion_controller_leave           (GtkEventControllerMotion *controller,
+                                                             GdkCrossingMode           mode,
+                                                             GdkNotifyType             detail,
                                                              GtkTreeView              *tree_view);
 static void gtk_tree_view_motion_controller_motion          (GtkEventControllerMotion *controller,
                                                              double                    x,
@@ -5437,6 +5441,8 @@ static void
 gtk_tree_view_motion_controller_enter (GtkEventControllerMotion *controller,
                                        double                    x,
                                        double                    y,
+                                       GdkCrossingMode           mode,
+                                       GdkNotifyType             detail,
                                        GtkTreeView              *tree_view)
 {
   GtkTreeRBTree *tree;
@@ -5462,6 +5468,8 @@ gtk_tree_view_motion_controller_enter (GtkEventControllerMotion *controller,
 
 static void
 gtk_tree_view_motion_controller_leave (GtkEventControllerMotion *controller,
+                                       GdkCrossingMode           mode,
+                                       GdkNotifyType             detail,
                                        GtkTreeView              *tree_view)
 {
   if (tree_view->priv->prelight_node)